gnomeos: Make python actually work, install bash by default

diff --git a/gnomeos/yocto/classes/gnomeos-contents.bbclass b/gnomeos/yocto/classes/gnomeos-contents.bbclass
index b84c148f54c5b543fc53bb8a45db63f7f6094878..ff967ee9122190aa345a27fc17db3a2019325078 100644 (file)
--- a/gnomeos/yocto/classes/gnomeos-contents.bbclass
+++ b/gnomeos/yocto/classes/gnomeos-contents.bbclass
@@ -11,7 +11,8 @@ PACKAGE_INSTALL = "task-core-boot \
                   coreutils \
                   ostree ostree-init \
                   strace \
-                  python-core python-misc"
+                  bash \
+                  python-modules"
 
 RDEPENDS += "${PACKAGE_INSTALL}"
 DEPENDS += "makedevs-native virtual/fakeroot-native"

diff --git a/gnomeos/yocto/commit-yocto-build.sh b/gnomeos/yocto/commit-yocto-build.sh
index b3b1786a26847f2b5ab7de654daa6cbc3561889f..5307fefad7d87650fbf9819dc88ede56a1355a5d 100755 (executable)
--- a/gnomeos/yocto/commit-yocto-build.sh
+++ b/gnomeos/yocto/commit-yocto-build.sh
@@ -24,8 +24,10 @@ shift
 
 ARCH=x86
 
+BUILDDIR=$WORKDIR/tmp-eglibc
+
 OSTREE_REPO=$WORKDIR/repo
-BUILD_TAR=$WORKDIR/tmp-eglibc/deploy/images/gnomeos-contents-$BRANCH-qemu${ARCH}.tar.gz
+BUILD_TAR=$BUILDDIR/deploy/images/gnomeos-contents-$BRANCH-qemu${ARCH}.tar.gz
 
 BUILD_TIME=$(date -r $BUILD_TAR)